Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 4 Jun 2010 11:31:07 +0000 (11:31 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 4 Jun 2010 11:31:07 +0000 (11:31 +0000)
commite2bc36d8c2bc5143d5b598eff96ba48e545a372e
tree21d3d5afbc5165a4d303855ddc6e12e88adb1f09
parente20d59ea958d1ad33ad22c2aaef73b97ad8307e4
parentd0d100d93f9e35cd8f5192942945e702c423b51e
Merge from mainline.